API cleanup

## Description

It has been a few years since it was looked over, and the Infosys API could stand be cleaned up and refactored a little

@DreamSpawn knows where to look, and is going to clean up the API a little where it is for sure not going to be a problem.