Minor cleanup
Cleaned up a bit
Moved test code to another file, clean slate for actual game