Minor refactor and cleanup
Updated change log