cleanup code

[conchyliculture]

• reorganize methods
• make sure the "type& var" is the same everywhere
• apply proper var & func naming scheme
• fix warnings