Adding return statement on few functions.