Tidy
Fixed parameterization
Update modparams
Update modparams
Quote cleanup
Merge pull request #5 from indigophox/master

Tidy