got old alfred changes back and re-applied PEP8 standards to core files