* Eliminated unnecessary lines, cleaning code structure.