Code formatting and cleanup(OMS-217)