Reformat code
Refactor & reformat code

This reverts commit 3c7adef59d788b55fbe3904828a33f292d91ff78.