GUI and code clean up