Fix syntax highlight and improve structure