Cleanup for presentable version