Making code cleaner. PHEW!