Clean up Alex's code