More JSDoc + require/provide cleanup