simplify a bit
Merge branch 'master' of github.com:topazproject/topaz
simplify code