Revert "Code Quality"

This reverts commit bc1d70a66ee7fa365cdb32782cc6603e245aa515.
Revert "Revert "Code Quality""

This reverts commit cc7e1762d7fe9d6ddb55233620841f491b1e4c77.
Revert code quality attemp