Small cleanups
Updated conversion and index