Cleaned class