Replaced tabs with spaces and other minor fixes