Move class-level attributes to top