Code cleaning

Code Maid + Feature change.