Added aliases, moved exports to below each function