Fixing tabs and comments