Refactor logging; adjust IA order placement