Reformat code
Update to work with latest rgkit (with my playername fix)
Cleanup