refactor latest wax related code, update wax