Emil code review