refactor: group forms, organize code