adding line breaks
removing unused params