clean up model with usage of request class