Cleaning code (once again)