Better grouping and structure of methods