classes.js re-factoring part #2