Changed some minor things according to PR