spaces instead of tabs and remove trailing spaces
spacing clean-up
clean-up spacing and use correct types
update logging output