Refactor avoid late keyword as much as possible

Refactor avoid late keyword as much as possible #295