Minor change on the code and fix line length longer than 120 chars warning