update builder method and cleanup