Restructuring housing review form to be less clever