Refactor, forms