Cleaning code file (see issue #1)