Null->None, remove filter on decreasing values, add spaces for pep8
All tests pass!