formatting, doc strings, comment fix