CJ's First pull request for review

First pull request for review.
`end` at 18, 4 is not aligned with `def` at 8, 1