Small tidy-up, removed static field