refactoring and cleanup of Record/Indi