tiding up the application