removed excess code

and cleaned up the look