Refactors annotation.js and removes old comments