Refactoring

Made more annotation tool methods instance rather than class
Clear tool when note popover dismisses