some codestyle changes
debug outputs deleted