Small cleanup

variables that are made static should have the s_ prefix.