Pipes; cleanup & formatting; Mostly done, waiting for feedback