code indentation fixes
notice fixes / indentation
Merge pull request #1094 from kurund/CRM-12976

CRM-12976