Cleaned up slightly before I fell asleep.