Monor refactoring after code review