minor-change & cleanup