fixed file layout and syntax(again)