Code clean-up, comments, whitespace

Added/removed comments, removed whitespace