Refactor and improvements...