Cleaned up Doc