Update: Assistance (Fatal-Error)
Code Review: Refactor