Remove redundant code
Minor refactoring
Update CHANGES