Apply cleanups from 675e049ceeb0da9
Merge pull request #74 from cesanta/cleanup

Apply cleanups from 675e049ceeb0da9