Minor beauty changes