Minor code cleanup & changelog update