Tided up the application