move comments to their own lines
rename a couple functions, remove `self = this`