LPS-32801 - Refactor ATag.java code