MAINT minor code improvements after kowey review