Formating and Name Refactoring