finally fix annoying declaration format