More readable

Refactor some lines of codes to make it more readable.