ahammett: minor refactor and documentation