Cleaned up Document parameters and a couple method implementations