Initial Tidy up