Clarified code with some static privates