Cleaner
little more cleanup