fixed up to make it cleaner.