Cleanup and comment