LAPPS-33 some refactoring
Merge pull request #45 from learning-layers/small_user_resource_refactoring

LAPPS-33 some refactoring