Fix based on comments in review