Refactoring
Better handling of editTexts