Clean up dao + update business model