Merge "Cleaning up code, comments, and documentation for SimpleForwarding"