refactored some unnecc. statics