Feature list tidy up