Some formatting and moved the economy to it's own class.