Revert "[FEATURE] Fix style code by PEP 8 for market.py"

Some of the refactorings in #615 do not result in equivalent code, especially those pertaining to [inline if](http://stackoverflow.com/questions/11880430/python-inline-if-statement).

We shouldn't merge any style fixes until we have `pylint` properly installed onto the build.