Prepare code for ONGR standard (Closes #7)