Minor bug + extra comment cleanup