added: @{place} and clean code + some improvements