Cleanup, some customisation