fixed some declarations
reformat with pycharm