styling and remove some statics