Made this much cleaner