Minor formatting changes; removed commented old code, cleaned up comments