Code formatting
Chef: Massive restructuring