General cleanup and customization