removing unnecessary code
removed old code and updated formatting
updated old code and formatting
fixed conflicts