many small non functional changes