Technically no change other than formatting and comments