Refactored form types to utilise a form method for setting class variables