CJ's First pull request for review

First pull request for review.
`end` at 39, 8 is not aligned with `if` at 35, 2