Quick code reformate
Refactor
Refactor
Refactor