Improved Web API code ish dunno tbh lols