[037] Cleaning code