Add JSDoc + Code Cleanup