Just making my code a bit more tidy