Documentation added and junk removed