Litt syntax cleanup