fixed comments from re-used code