Revert "Reformatted code and optimized imports"

This reverts commit 8b06bec2b920636ae63199e80802c3260dc4cbb1.

Reverted the last commit