Minor refactor
Updated docs
Updated change log