final code cleanup, remove whitespace