cleaned up front end a little more