LiSa minor refactor