Minor formatting / restructuring