sorting out code parts
code formatting
salt fix