Readability refactor

Just a little house work because I am stuck at home ill.