some formatting and adding end