Cleaned up data, added repo methods