Restructured the code, removed unused methodes, no new functionality