Code cleanup, fix for relative filename.