code polishing #17