general cleanup of method names