Update: minor cleanup/improvement [wip]