Some methods in this package use odd spacing and formatting, we could align it to the rest code in the package. Also, we can reuse some new language features like switch expression, etc.