Removing some comments and improving indentation