Halfway done with polishing comments/code.