Minor changes and quick code review