fixed file layout and syntax