Cleaned up dto creation