Remove unnecessary comments and unnecessary return