Comment fixes

Fixed previous draft's now-pointless comments, reformatted some code.