A couple code refactors to make it easier for users and potential developers to understand what's going in the code.