Clean up forms slightly