code cleanup

.