Refactoring
wrapping text at 80th column and comment change