Refactored for better nameing convention.