More logical source code grouping