Improve method names
Two more methods to extract some logic from view / improve readibility