Some dart code cleanup