Formating issues
Code refactoring