Adding a little protection & new class for data clearing methods