cleaned up some statics