Major tidy up step 2 of 3