cleaning up some of the front end stuff