template cleanup
style - just text spacing
updated
updated
updated
minor formatting
merge
merge