Address Tobias' feedback comments.