changed return type, removed comments