Clean up variable names and their documentation
Merge pull request #18 from xeross/cleanup-options

Clean up variable names and update their documentation