Improve readability

Unimportant changes