ROO-3331: Post 1.2.3.RELEASE code refactor and clean up - formatting and cleanup