general cleanup and trying new default value idea