fixed syntax error introduced during clean-up
more syntax clean-up