minor formatting, code comments