Removed log. Clean up in comments and indent.