clean up some code, coffee shop commits