Adding auto-caps and few cosmetic changes.