Added filename formatting