reformated to keep phpstorm in line with pep8 standards, and removed old files