Removed some redudant code, improved verbosity of some messages