Simplified code slightly

* Converted one character strings to chars
* Converted one-line `do; end`s to `{}`s