Added sender to comment; style fixes