Formatting
Redundant
Rename
Merge pull request #25 from pikesley/major-refinements

Major refinements