Added filename format function