code cleanup; close #17