Second stab at loading and cleaning data