Cleanup and add more details