some style changes
remove puts
couple more style changes