Modularizing the intake form and its map.