Finalize JavaScript object oriented refactor