Cleaned up feature for accuracy and naming