cleanups
Merge branch 'master' of https://github.com/gl00my/catesc
cleanups