Added name and spacing standards