Revised classes to use AIE Coding Standards