committing to merge with dev
Moved parameters for private calls to class variables to reduce clutter