Some code refactoring; updated Turkey