code cleanup
changelog update