Change conversion of Species concentration
Massive refactoring for readability