cleaned up builder a bit