code cleanup
whitespace and cleanup