Made a couple small tweaks to tidy up my code