Cleanup and comment includes