Making solution a tiny bit cleaner.