Refactoring to make future changes easier

[krystophny]

• Split mesh type into two
• Clean up code of Sergei for efficiency (don't call routines every time)