Minor Cleanup/Organization

Cleaned up parameter order, name, and default values for more intuitive
use

Documentation was updated to reflect all changes and renaming