Minor formatting fixes: replaced tabs with spaces, trimmed trailing spaces, etc.