consolidated a bit, removed a couple needless comments