JAL-2422 tidy of methods and parameters