refactored and decluttered our api requests heavily