Refactoring: Simplify code...