Form code polishing