Since not passing all params don't need to set attributes to nil
Rename method. Inline method
Split helper into two
Refactor helpers
Small refactor and rename methods