cleaning up the front-end