removed some whitespace, unneeded classes
removed some whitespace, unneeded classes