minor optimization
comment fix
1001 whitespace/newline/indent/braces/standards fixes