Clean up the forms some and separate