Merge pull request #73 from justgo129/master

More cleanup
Made figurenumber conditional as did prev. with tableNumber