clean up: indention, spaces