[45813] Code cleanup; closes #19