Fix comment/string indentation and keyword blocks