I made the code look better