improve source
split kind