Fixed review comments from Lucas