cleaning up, replace more literals with vars (gui)
cleaning up