Make everything 80-lines long
Bug fix