remove horrible syntax