added dependency to kibit
minor cleanup: more idiomatic code