1. Improved readability
2. Adjusted style