fix comments and remove spaces from name