refactor wall actor
refactor wall actor further