(Define) Formatting

Refactored code