fix syntax error & clean-up