Make things cleaner