code cleanup: #21