HOPKINS: Some more refactoring in BTOCEAN code