Cleanup + JSDoc