Fixed 99 bug and made it follow more to pep8 standard