change namespace and classname, beginnning of code-formatting, added method visibility