refactor and clear cells on init