Cleaned up a few more things