review, fix, clean and comment