P3: IMHO indentation was better in the original code.