Also, move static fields before instance fields (group together with the Logger)