Merge "API Documentation and Constant cleanup."