- remove static usage
- renamed class
- return proper responses