Making the code a bit neater.