Removed overuse of static members and methods.