i appreciate the formatting cleanup, though appreciate it less when mixed with the actual changes