While I was doing similar things, decided to clean these up.  No need for parameter passing, and don't hardcode "static"