Tidy up some lines of code for easier reading