Minor code fix and capitalized comments