Clean up: These should be static
Clean up: These should be static
Merge pull request #314 from adneal/static

Clean up: These should all be static