More JSDoc + provide/require cleanup