Little changes done here and there