Basic source code cleanup done. Everything is working before modeling shrimp