Refactoring codebase
Better request/response hadnling