Only-liner-if and return statement added