WIP: minor cleanup