Rename builder and clean up indentation