Added consistency to indentation style

Indentation is now more consistent across files, using tabs with 2
spaces in size.