Add comments and remove unnecessary echos