removed unnecessary 'goodies', cleaned up comments