commit looks more messier that it really is