code cleanup and changelog added
2 files changed