Clean up code and test divs