optimized ocean logic, removed unused field vars