Use warn() instead of console.error()
Cleanup older code, write in accordance with present Annotation framework