Cleaned up and removed assignment statements from calculations, closes #47.