Cleanup

General cleanup
Changed default salt

Changed default salt
?

?