Improved commenting and removed superfluous packages