Tidy
Merge pull request #1 from Yharooer/dev

Tidy