Fixed things according to review