Code cleaner (4/42)

Code cleaner