Cleaning Up Front End