CJ's First pull request for review

First pull request for review.
Redundant `return` detected.<br>Tab detected.