changed naming and rectified spacing issues