[TW189] - Cleaner looks