clean up more syntax