This commit shouldn't make any substantial changes to the form or its presentation. This is just cleaning things up as a development aid.