Bit of cleanup, and added hsf-http-form