reorder main class paramaters more logically