Take my comments!
Attempting to undo my mistakes :S