Builder code cleanup. Release ready!