debugging code removed
code clean-up