Code cleanups to comply with coding style. Get rid of red dots in pycharm.