Formatting; removed old unused code.