refactoring
indentations
cleanup