Fixed calls to "this" in static methods. Changed 2 private static methods to instance methods.