Cleaning up and prepping this to be used on future projects