Cleaned the builder a little.