fix naming and spacing issues