removed some unnecessary return keywords