Improvements
Splitted syntax generation into multiple methods