Made everything a bit cleaner.