changelog cleanup
Declare static methods as static