Comments and refactoring per issues #13 and #14