Fixing commit issue
Minor fumblings with code