whitespace cleanup
add comments, refactor: