Some small cleanups
Merge branch 'master' of https://github.com/TheRealFalcon/FalconCatcher