Rearranged functions order for better docs