Minor changes to adhere to line length limit and remove unneeded comments