Formatting clean-up; removed some debug statements