Cleaned up, added comments
Cleaned up, added names
Misc.