Ocean constant refactor