Update code and tidy dataset