Clean Up

Added more documentation and removed left over code