Less line of code

Nothing much only simplified with less line of code