Removed a lot of old code from the refactor

Styled everything