Changed filename schema and removed unnecessary logic