Improve BlockWorld class