fixing spacing, renaming class