refactoring
fixed and cleaned code
Merge branch 'feature/rest-api-refactoring' into develop