more cleanup and remove form from Method names and comments