Remove complexity by not using parameters

Removed some of the complexity of default actions to use class variables
directly instead of passing them as parameters