Clean up
15
More changes