Make it simpler and cleaner.