Migrated some deprecated calls and updated formatting