Refactor: Code-Review