code cleanup, whitespace and renaming class