cleaned up the assembly bits