Fix indentation
Move validators into form abstraction
Remove old handler + update namespaces for -> form namespace