CAW-5 | Cleaning up codez