Some ease of use refactoring

Renamed some variables to make them easier to work with.