Remove comment and unnecessary return