uncommenting instructions
refactoring in api set rule
adding returns for clarity
Minor refactoring and adding test for non-leading