fix spacing, remove comments
more spacing fixes