Fixing issue with blanking values
Cleaning a few things up.