improve some indentation
try to improve highlight