a-style cleanup