Some print cleaning and comments added