Form cleaned up