Notes changes, pylint cleanups