Quick fixes

* Removed static keyword from some methods.
* Added custom class prefix