Removed some unnecessary complexity.