Cleaned up ``Core`` constructor