Cleaned up and reduced the size on the Core