Made some things cleaner.