AC package

Code review cleanup