Done some code clean up in fabicon.py