Cleaned up naming. Cleaned up description.