Cleaning up code to be more sdk-esque