Attempt to cleanup docs a bit more