i03t15 Code refactoring to OceanMaster