Refactored to cleanup symbol names.