Cleaned up Core