Nitpick Rick (clean up)