Just making the code neat and tidy