I always split into small commits