cleaning up codebase, changing UI