* code polishing