Improve the code base (reviewed by conhlee)#19

patataofcourse wants to merge 14 commits into

masterpatataofcourse/Saltwater:masterfrom

conhlee-reviewpatataofcourse/Saltwater:conhlee-reviewCopy head branch name to clipboard