Cleaned up highlighted commands