Form parts: refactor, simplified