better code [skipci]