refactoring step one, make anything static that can be static (will change later)