Tidying up front end