Cleaned rendering everywhere