Enforced capitalization standards. Removed nested if.