Location improvements and code review