Cleaned up and ran docco again