more syntax cleanup