Fixing issues found in review