Aard: Minor refactoring after code review