Improved naming, removed unnecessary null checks.