File layout can do with a cleanup