Improved naming and comments.