Minor cleaning for less code and same function