Little changes after feedbacks from team