refactoring
refactor shrimp

And sex as enum
cosmetics
Merge pull request #1 from pav67/refactor-aqua

Refactor aqua