removed debugging code & addressed code style issues reported by coder.