Reformatted Source (no additional functionality added)