much cleaner I guess