making minor code cleanup and changelog