style updates and remove extraneous puts