Improve me (25/30)

Improve me