Dev

Code refactoring