Complete code review
Fixed one EOL issue