make static methods non-static and amend affected areas