Control indentation & add comments