cleaned up front end stuff