Further code cleanup - eliminated some unnused static vars, renamed the primorial size, clarified comments