refactoring billboards