Cleaning up a couple things to get it working