Code cleanup

* minor clean up
* attempting to remove Lorin singing / humming