Cleaner up (7/48)

Cleaner up