Cleanup to make documemtation easier