fixing #26: code cleanup

Sounds good