cleaning
Refactoring:
* Remove some small fns
* separate put db and response.
* formatting
Refactor: improving naming
correcting a couple of fails