cleaning up front-end