Improve indentation function and highlight

#100