Made the code even prettier!