Cleaned up generate a bit.