RAACMS-93: Code cleansed and functions renamed.