Kill long functions

fixes #3