Updated changelog and code cleanup