Refs #43 - Improved some variable names and docstrings