Correction and code formatting for Feature / reversing distribution