Clean up + added renderque.