Cleaned up gendata