Fixed several typos and code-smells in sample-config