Updated DAO DTO's. Formatted code whitespaces