renamed methods; coding style; pylint is happier