Refactor to use klassy.js