Updated comments and print messages