Remove repeated function
Fix success messages