fix formating
refactoring