Added an economy handler and tidied up the main class a little