Minor code layout changed according to pylint messages