Segregated forms into classes, cleaned up and organized code