Just a few cleanups
Merge pull request #1465 from darkwing/stylus-cleanup

Just a few cleanups