CHANGE: some comment additions & cleanup