Tiny clean-up before working on more completing the gui and adding more functionality