Remove some tabulations
Fix some indentation issues