Improve code more readability

Add final, short return form.