mkjn - code clean-up - 02/16/2013

mkjn - code clean-up - 02/16/2013