Refactored

A little bit, spaces, etc.