Shouldn't be there
Cleanup and add more info