refactored entity / view models converter methods