Cleaning code (minor details)