Could have been cleaner