refactoring and reformatting
refactoring