Fix variable and method ordering