some code simple editing
refactoring comments