Cleaned up a good bit more