some documenting and cleanup, EDUID-164