code cleaning : get rid of quick-and-dirty circular dependency fix by moving some code in separated file