Refactor to buildback coding style