Better grouping, indentation
Cleanup