Working on improving code.