Cleaned up small bits.