PEP8 goodness + integration tests done