arrange signatures above declarations, close #32