Comments formatting, Removed unneeded dependencies.