removed comment and modified return value