cleaned up some of the frontend