Migrating over to new code standards