Modifies poorly chosen variable name.
Moves interfaces to below their usages for readability.