CJ's First pull request for review

First pull request for review.
Use 2 (not -3) spaces for indentation.<br>Redundant `return` detected.<br>Tab detected.