Add some comments and clear bad tabulations