Fixed review comments so far