I dont like 1.9 key value syntax
cleaning up some trash