Code cleanup
Minor cleanup
Minor clenaup
Merge branch 'master' of https://github.com/pencil2d/pencil