Cleaned up WIP and Comments