Fixed bad smells from MS2