Safety commit
DDF-538 Cleaned up code.
DDF-538 Switched constant and variable
DDF-538: Fixed bug
Merge pull request #13 from harrison-t-lm/master

DDF-538