Cleanup/JSDoc