CJ's First pull request for review

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