Cleaning up a bit - in case of empty values.