Polishing up the form