cleaned up some funk