Minor code cleanup and understandable naming.