Some tweaks according to review