changed comment order and reformatted to use less space