Cleaning it up some before i continue dev