Modified existing comments and code