refactoring. indentation
clean up, indentation and so on