Updated based on linter suggestions