[WIP] Cleaned up the comments and a few messy bits