Added kind conversion and reformatted text