fixed typo plus some cleaning