Code cleanup, some renaming
Merge branch 'master' of https://github.com/tonyriddle/ComicHoarder