Refactored the forms to be cleaner as the guide mentions