Save monitor link, not next link and minor PEP formatting changes