Updated comments and kept consistency