Cleanup and unify slide