Reformatting and cleaning up of client interface.