Update code folding, indentation, keywords

This is my first pull request