import cleanup, commented out dead code, refactored redundant if/code on MarketApplication constructor.