Made the code pretty