Refactoring code. Adding builder for wall object