Improve code readability in a few spots