Removed local variable / method name clash
Avoiding lines > 80 chars.