Cleaning code, again