Fixed other comments than refactoring.