Revert "Reformatting and reformatting code"

This reverts commit cd0078268170d65942f12a246b90893b7467ed11.