changelog
minor code simplification