Refactor code, better, safer. simpler.