Cleaned up database design