Major code cleanup: replaced spaces with tabs