Rearranging the form for cleaner code