added salt and performed code cleanup (indents etc)