code cleanup, refactor, added static keywords for static methods