Aja refactor

my thoughts