Making the code pretty