Refactoring advice from Thijs

Start on GUI