styling, API call, etc
fixed conflicts