Cleaner up (4/48)

Cleaner up