Refactoring complete?

Looks way better - probably done for now