Make code tiny bit clearer, fix pylint.