minor TODO changes and code formatting