Clean up methods in builder