yay

Formatting
Code relocation/reusability improvement