[0.0.2] - [Alpha Teal] - Neatening up

Neatening up code