code refactored
changed comment