Issue #11, #1 Minor refactoring.