fix naming and removed extra spacing