Cleaned up a lot of stuff