Removed tags from calculations as they aren't used. Eventually alert calculations will need something like a required privilege
Refactored calculations into library.art and library.tb
Fixed two code style issues detected by IntelliJ