fixed 1.7 syntax
syntax cleanup