Add helper files

And make some cleaning for syntax