Clean up
Fixed