cleaned up front end