CJ's First pull request for review

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