Tiding up front end