Followed pylint suggestions