Cleaned up a bunch