minor formatting + refactoring for APSS