Clean up code part 2