Merge pull request #6 from ehelms/cleanup
Provides clean up and ordering change of parameters to reduce dependency
Merge pull request #6 from ehelms/cleanup
Provides clean up and ordering change of parameters to reduce dependency