Cleanup.
Merge pull request #13 from armm77/master

* Style
Core: More work.
‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌‌