minor updates to formatting and removing unneeded code