0.1.14
Worked on code clarification

Changed some names to reduce ambiguity, additional comments. This
is the start of some overall refactoring for clarity