Improved indentations and pylint warnings
Renamed