code review and syntax tuning