Small changes to increase readability throughout code.