Tidy up for cleaner code