Cleaned up control mapping.