Added some documentation and removed some waste data