polishing the changes
cleanup