Begin cleaning up Monster class