Basic stylus cleanup
Merge pull request #1632 from darkwing/stylus-cleanup-more

Basic stylus cleanup