Quick syntax cleanup