Removed outcommented code and added success messages