Minor code refactoring
Add note on possible problem to talk